From: Glenn Morris <rgm@gnu.org>
Date: Fri, 27 Feb 2009 04:00:45 +0000 (+0000)
Subject: (rmail-speedbar-move-message): Preserve the directory part against
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1506
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9f509f5bdcade4c48c41e00e254d1bc4b4041521;p=emacs.git

(rmail-speedbar-move-message): Preserve the directory part against
rmail-output's oddness.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1e2131cccad..d9101f4bb41 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3891,13 +3891,15 @@ TOKEN and INDENT are not used."
 	  (forward-char -2)
 	  (speedbar-do-function-pointer)))))
 
-;; FIXME loses the directory part.
 (defun rmail-speedbar-move-message (text token indent)
   "From button TEXT, copy current message to the rmail file specified by TOKEN.
 TEXT and INDENT are not used."
   (speedbar-with-attached-buffer
    (message "Moving message to %s" token)
-   (rmail-output token)))
+   ;; expand-file-name is needed due to the unhelpful way in which
+   ;; rmail-output expands non-absolute filenames against rmail-default-file.
+   ;; What is the point of that, anyway?
+   (rmail-output (expand-file-name token))))
 
 ;; Functions for setting, getting and encoding the POP password.
 ;; The password is encoded to prevent it from being easily accessible